From cc9caf61f5fa4f2c2dd3cb5944a78dc5c20d1ad0 Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Sun, 23 Jan 2022 22:54:54 +0100 Subject: [PATCH] Use Debian build flags for the GUI --- debian/changelog | 1 + .../patches/0008-Add-Debian-build-flags.patch | 25 +++++++++++++++++++ debian/patches/series | 1 + debian/rules | 5 ++-- 4 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 debian/patches/0008-Add-Debian-build-flags.patch diff --git a/debian/changelog b/debian/changelog index a21e9c985..3186f3eba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ gpsbabel (1.8.0+ds-2) unstable; urgency=medium * Add patch for failing test on i386 + * Use Debian build flags for the GUI -- Jochen Sprickerhof Sun, 23 Jan 2022 22:24:45 +0100 diff --git a/debian/patches/0008-Add-Debian-build-flags.patch b/debian/patches/0008-Add-Debian-build-flags.patch new file mode 100644 index 000000000..83345bb21 --- /dev/null +++ b/debian/patches/0008-Add-Debian-build-flags.patch @@ -0,0 +1,25 @@ +From: Jochen Sprickerhof +Date: Sun, 23 Jan 2022 22:54:24 +0100 +Subject: Add Debian build flags + +--- + gui/app.pro | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/gui/app.pro b/gui/app.pro +index 81385bf..d4c1ef1 100755 +--- a/gui/app.pro ++++ b/gui/app.pro +@@ -49,6 +49,12 @@ win32-g++ { + QMAKE_LFLAGS_RELEASE += -static-libgcc + } + ++QMAKE_CPPFLAGS *= $(shell dpkg-buildflags --get CPPFLAGS) ++QMAKE_CFLAGS *= $(shell dpkg-buildflags --get CFLAGS) ++QMAKE_CXXFLAGS *= $(shell dpkg-buildflags --get CXXFLAGS) ++QMAKE_CXXFLAGS += $(shell dpkg-buildflags --get CPPFLAGS) ++QMAKE_LFLAGS *= $(shell dpkg-buildflags --get LDFLAGS) ++ + # Set QMAKE_TARGET_BUNDLE_PREFIX so we get the correct CFBundleIdentifier in Info.plist + darwin:QMAKE_TARGET_BUNDLE_PREFIX=org.gpsbabel + diff --git a/debian/patches/series b/debian/patches/series index 90d58ad61..9f5bc4dc8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ htmldoc-location gmapbase.html-location Disable-donation-nagging 0007-Add-workaround-for-failing-test-on-i386.patch +0008-Add-Debian-build-flags.patch diff --git a/debian/rules b/debian/rules index a2c61570d..613b7c2eb 100755 --- a/debian/rules +++ b/debian/rules @@ -21,9 +21,8 @@ override_dh_auto_configure: convert -resize 32x32 gui/images/appicon.png debian/gpsbabel.xpm xsltproc --output debian/gpsbabel.1 /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl xmldoc/gpsbabel_man.xml -override_dh_auto_build-arch: - dh_auto_build - if dpkg -s qtwebengine5-dev; then $(MAKE) unix-gui; fi +execute_after_dh_auto_build-arch: + if dpkg -s qtwebengine5-dev > /dev/null; then dh_auto_build -- unix-gui; fi override_dh_auto_build-indep: $(MAKE) gpsbabel.pdf -- 2.30.2